Skip to content

Fix incorrect error logging in Stats indexer and OAuth2 (#12387)#12422

Merged
lunny merged 1 commit into
go-gitea:release/v1.12from
techknowlogick:backport-12387
Aug 4, 2020
Merged

Fix incorrect error logging in Stats indexer and OAuth2 (#12387)#12422
lunny merged 1 commit into
go-gitea:release/v1.12from
techknowlogick:backport-12387

Conversation

@techknowlogick
Copy link
Copy Markdown
Member

Backport #12387

Co-authored-by: Lieven Hollevoet hollie@lika.be

* Fix incorrect logging in oauth2.go

Fix go-gitea#11945

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Handle ErrAlreadyInQueue in stats indexer

Fix go-gitea#12380

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Fixes type in error message of indexer

Add the missing character in the error message.

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lieven Hollevoet <hollie@lika.be>
@techknowlogick techknowlogick added this to the 1.12.4 milestone Aug 4, 2020
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Aug 4, 2020
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Aug 4, 2020
@lunny lunny merged commit 6015d30 into go-gitea:release/v1.12 Aug 4, 2020
@techknowlogick techknowlogick deleted the backport-12387 branch August 18, 2020 03:18
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants